Commit changes from last March (blush) for new web site to docbook generator.

diff --git a/Makefile.in b/Makefile.in
index 2bf3f766e7994a9da16111f5b78ba67848c86673..612e5f08f512b62ec9f66e7f18e21eb5239edea7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,14 +183,14 @@ dep:
        echo "internal_styles.c: mkstyle.sh style/*.style\n     ./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)"  >> /tmp/dep
        echo Edit Makefile.in and bring in /tmp/dep
 
-$(WEB)/htmldoc-$(DOCVERSION)/readme.html: FORCE
+$(WEB)/htmldoc-$(DOCVERSION)/index.html: FORCE
        mkdir -p $(WEB)/htmldoc-$(DOCVERSION)
        perl xmldoc/makedoc
        xmlwf xmldoc/readme.xml         #check for well-formedness
        xmllint --noout --valid xmldoc/readme.xml       #validate
        xsltproc \
         --stringparam base.dir "$(WEB)/htmldoc-$(DOCVERSION)/" \
-        --stringparam root.filename "readme" \
+        --stringparam root.filename "index" \
         xmldoc/babelmain.xsl \
         xmldoc/readme.xml
        chmod 755 tools/mkcapabilities
@@ -233,7 +233,7 @@ gpsbabel.html: FORCE
 readme.txt: gpsbabel.html
        lynx -nolist -dump gpsbabel.html  > $@
 
-doc: gpsbabel $(WEB)/htmldoc-$(DOCVERSION)/readme.html gpsbabel.pdf # readme.txt
+doc: gpsbabel $(WEB)/htmldoc-$(DOCVERSION)/index.html gpsbabel.pdf # readme.txt
 
 FORCE:
 

diff --git a/vecs.c b/vecs.c
index 315ccd86dba3b0a16885933b599c6e872e964466..31a28e9e00c22ec4dae2ee193dff084dba0919a3 100644 (file)
--- a/vecs.c
+++ b/vecs.c
@@ -735,7 +735,7 @@ vecs_t vec_list[] = {
         {
                 &xol_vecs,
                 "xol",
-                "Swiss Map # (.xol) format",
+                "Swiss Map",
                 "xol"
         },
         {

diff --git a/xmldoc/babelmain.xsl b/xmldoc/babelmain.xsl
index 1bcac19109c36f9df1c96e73436b39d1592aa7c3..132c2f9e0d00a6a907d0c0e8079f641216d80095 100644 (file)
--- a/xmldoc/babelmain.xsl
+++ b/xmldoc/babelmain.xsl
@@ -6,29 +6,43 @@
 
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
 
-<xsl:param name="html.stylesheet">http://www.gpsbabel.org/style3.css</xsl:param>
 <xsl:param name="use.id.as.filename">1</xsl:param>
 <xsl:param name="chunk.first.sections">1</xsl:param>
 <xsl:param name="toc.section.depth">1</xsl:param>
 
-<xsl:template name="user.header.navigation">
+<xsl:template name="system.head.content">
+  <xsl:text>
+  </xsl:text>
+  <xsl:comment> InstanceBegin template="/Templates/primarypage.dwt" codeOutsideHTMLisLocked="false" </xsl:comment>
   <xsl:text>
+  </xsl:text>
+</xsl:template>
 
+<!--
+<xsl:template name="system.footer.content">
+  <xsl:text>
   </xsl:text>
-  <xsl:comment>#include virtual="../navbar.inc" </xsl:comment>
-  <xsl:comment>#include virtual="../doc-header.inc" </xsl:comment>
+  <xsl:comment> InstanceEnd </xsl:comment>
   <xsl:text>
+  </xsl:text>
+</xsl:template>
+-->
+
 
+<xsl:template name="user.header.navigation">
+  <xsl:text> 
   </xsl:text>
+  <xsl:comment> InstanceBeginEditable name="scontent" </xsl:comment> 
 </xsl:template>
 
 <xsl:template name="user.footer.navigation">
   <xsl:text>
-
   </xsl:text>
-  <xsl:comment>#include virtual="../doc-footer.inc" </xsl:comment>
+  <xsl:comment> InstanceEndEditable </xsl:comment>
+  <xsl:text>
+  </xsl:text>
+  <xsl:comment> InstanceEnd </xsl:comment>
   <xsl:text>
-
   </xsl:text>
 </xsl:template>